From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Fri, 9 Aug 2019 21:30:44 +0000 (+0200)
Subject: AppIcon: Nullify _draggable if available on destruction
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~839^2^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=209d332a30fff85f4d607111445ab8c0fa15c195;p=gnome-shell.git

AppIcon: Nullify _draggable if available on destruction

When an AppIcon actor is destroyed we try to unset a non-existent draggable
property.

Fix the typo, doing this even if we're not currently in a drag operation.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/677
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 50b8fd9b9..ac6d8ce25 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1897,9 +1897,10 @@ var AppIcon = class AppIcon {
         }
         if (this._stateChangedId > 0)
             this.app.disconnect(this._stateChangedId);
-        if (this._draggable && this._dragging) {
-            Main.overview.endItemDrag(this);
-            this.draggable = null;
+        if (this._draggable) {
+            if (this._dragging)
+                Main.overview.endItemDrag(this);
+            this._draggable = null;
         }
         this._stateChangedId = 0;
         this._removeMenuTimeout();